Merge remote-tracking branch 'upstream/master' into pr4988
authorXimin Luo <infinity0@pwned.gg>
Tue, 6 Mar 2018 18:56:35 +0000 (19:56 +0100)
committerXimin Luo <infinity0@pwned.gg>
Tue, 6 Mar 2018 18:56:35 +0000 (19:56 +0100)
commit31f6f84eff5797a68a9a77057d2e740275e99e81
treea979b0d7b0b412513f6b49390b323468912934a2
parent9c5eecd41900686a1fee27a3f6ebd6eecfa14e36
parentae796ad84a742ea39a2cb4a0c8adb0def8cee725
Merge remote-tracking branch 'upstream/master' into pr4988
src/cargo/core/resolver/mod.rs